Added small bits and bobs