More cleanup for the bugs / minor features list