Some cleanups

Just cleaning up bits and pieces here, with one or two minor bugfixes (like not having all game objects share one lock!)