Seebs/misc tweaks

This is a handful of local tweaks I've made to make Flower work better with a local project. Nothing super exciting, just making it easier to use existing code that had different assumptions.