UPDATED: Eluna

Fixed errors, didn't see a couple methods were already there. Added this on my todo list: Organize everything