many fixes & improves