Added some bugs.