Added docs, fixed some method names