bundle module interpretation changes and bug fixes