small tweaks to bring module into the standard