Various updates following comments & info from Nick @ Bytemark