Various updates and bug fixes.
Thank you!! That pasted crop disappearing thing actually cost me quite a bit of work...