Miscellaneous updates sorry

(accidently uploaded key and lost the history)