Added some methods. Fixed some #111 and #155