General Bits and bobs

I’m sorry for the exceedingly bad practices exhibited in these commits.