Some Speed improvements
Changed website