fixes and ux improvements