more improvements

ok done you may merge :+1: or grant me permissions so i can merge also :blush: