More comments and terminology unification
Updated documentation