Minor fixes + cheat grid