Regular v0.010

Multiple improvements based on Erin McLaughlin feedback