Cosmochoria: Quick Patch 0.157 & 0.158

Phew. Long night. Quick fix to some key stuff found in the last huge build... Trying to get this as stable as I can so there might be a few other small quick fixes before the next big update. Tomorrow i get on a plane t…