Bits and bobs

@tterrag1098