small features and bugfixes