2.2

Fixed some bugs.