two new modules. some bugfixes