V6!

Some bugs needed squashing! Everything is fine now.