e: some minor module tweaks