Flavors Cont.

Work on flavors, various bug fixes