bug fixes, gui changes
...