Bugfix output screen bug #77 and bug #84