some fixes and ui updates