Fixes

Don't wipe out builder
End Turn toggling
Autodraw end of round