minor fixes - UI, code