added headers to codeblocks and consolidated list