PEE WAR!!: Fixed some bugs

Fixed some bugs