removed wrong check (closes #51)
removed warning and adjusted indenation
removed warning
made output more readable
added some obvious preconditions