bugfixes: display and code