loads of new options and bugfixes