Cleaned up and fleshed out some sections