Many improvements and new features