fixed some name conventions issues, updated documentation