many fixes...