Further wheel based improvements

Basically a tidy up of the script. More to come.