Fixed some bugs!