Move draw code
fix comment
Do not store player gamemode