Fixed the modularity issue, and simplified some sections.