several fixes collected the last days :)