minor architecture improvement
  - used strtoupper to get rid of case sensitive name checks
  - added "else if", it's not nessecary to check for the second "if", if
the first one was allready true
Improved the phrasing of the error messages.