Pedantic fixes, and a faster module.