Fix some references
Refactor more
Change section names