bugfixes, added dictionaries, extended base