Added more sections and other updates