small changes, bugfixes