few bugfixes and features