Performance improvement and bug fixes.