Fixed some embarrassing, drunken logic bugs