lots of features and bugfixes