Added checks for enough parameters
Ignored "connection"-section (line 200ff.) - needs to be checked
Fixed paramter check