Low hanging fruit

A bunch of little enhancements