better wait screens, small bug fix...