POD documenting & some improvements