- several fixes ant TODOs