cleanup
enhanced ux on settings
version up