adding some comments and properly naming a couple modules