bugfixes and a shitton of UI