Updated screens better, fixed some coordinates