More cleanup and feature adds.