Fixed parenthesis, added module_width in more places

I guess I just needed to step away. I stared at this for 2 hours and it
looked right before.