several fixes + extensions