cleaning up bugs, more help for the arguments, working around a Debian wheezy bugs