some more fixes, added command line args