Many minor improvements
...