Bugfixes, new prototype display code