Fixed wcs bug after wcs update and new issue with limb and grid

This fixes issues #466.