removed old comments, checked basic functionality, added a few methods