Almost done with 3.5.3. Wanted to commit before I delete startat code
Oops... Here's the rest of the commit.
Hopefully final commit of 3.5.3
Very small changes