I like all changes suggested by OP! The first swing against VoW idea is good as well.