minor bug fixes
Add flox & locale integration
Merge remote-tracking branch 'origin/master'