a few bugfixes. UI work now, but also bugs inside