Fixes and cleanup
Update for GameLib