[Edit] Critical bugfixes for coderew passing  :)