correct bugfixes and add module map style