Edits for develop

Late night minor tweaks.