Bugfix and commandline arg fix