Cleaned up some bugs.'