bugfixes and dependencies