Fixed several inconsistencies in messages and errors. Added help output support