various changes including fixed the player bug

Almost at alpha; solved a lot of the TODO's. Added a couple new
ones too.