zeldy proofed, removed some todo stuff