Bugfixes and missed options