Many improvements, some in progress