Finalise Footywire code
Misc bug fixes