few other tweaks. Keeping the lock - I'll be getting on a train in a bit and will edit there.