build helper work
tweaks
[FLAPI-145] enum selectors
cleanup
cleanup