Added missing methods

...which were mysteriously in another file. spooky. Also some comments.