Bug fixes

Preparing for a few new bigger features like Panels and Research.

Not much today. Going to add play citations soon.