several improvements of core :-o