Fixed template and bibliography
Did some gathering of info