All good now apart from stuff on the stuffed disk. One thing messed with my head a bit. I recommend using UUIDs in /etc/fstab if you're not doing this already. Saves mounting confusion when /dev/sda dies and /dev/sdb becomes /dev/sda, sdc becomes sdb, etc.