Changed options on some diagrams for better spacing etc. Also general tidy up, deleted unused files.