Fixed some bugs - Added new bugs