* many fixes