fixes + UI work ... to be continued