Cleaning out the Cobwebs #1

Various updates that don't merit a full post