Added documentation, minor required methods