several fixes - see git