various bugfixes (mostly dependencies and imports)