removes crazy nesting yo
fixes spec, fixes game model methods