Added more methods
Stripped tabbed comments