Updated return statements and gamestatus