a few features and some bugfixes