Lots of old and new edits that we forgot to check in