UPDATED: Eluna

Added some more unit methods