refactored me() to action()
commented core more
Merge branch 'develop' into feature/encrypt