UPDATED: Eluna

Some misc. cleanup, renaming of a few methods and jazz.