changed paramter behaviour and some other minor stuff