Add proper citations and references, as well as notes