XXX bits and bobs 8646025

XXX bits and bobs

XXX bits and bobs

added: