more improved plotting, intermediate checkin