Made some fixes.
Removed old alternate versions.