More speed improvements.
Small tweaks.