merging over the latest flo stuff and extras