Bugfixes and graphical updates