Implemented a few more methods
Fixed compile error.