Added commandline output, some stability improvement