Loads of updates to better reflect my current workflow.