Fixed some boolean logic errors, and adjusted some numbers