Flair & other improvements