bugfixes, renamed module