Hatchd edits

Merged edits we want to get pushed to the master of the main repo