Speed and bug fixes.