Remember playerstate, fix one old bug and remove the hacky fix for it