bugfixes + gui rework