Oops. Fixed some bugs