cleanup, screen position tweaks