Fixed bug where non-range conditionals were being accepted. Allowed parameters to be used. Added code so || combination can be used.