moved some figures and listings to make annotation and output sections look a bit better