fixes to ui & other