updated documentation, fixed some naming