Improved if statements a bit.
Added integers and booleans.