Many improvements
ready for launch