several fixes & added exclusion