Many improvements