Added: Configuration file, removed several cli options and several fixes.