Fixed issue with FillBar having no Fill field... Ugh!
Some code clean-up.