fixed various clipping