minor fixes and better output messages
some fixes, better commandline handling