Sorted a few plugins, general spring clean, etc.