various detail-fixes for a proper style with clip in and out