bugfixes and gui