minor improvements
speed improvements