bug-fixes & Screen-Management