some tailor fixes