Some other subtle improvements
Fixed drawings