Ten min update and bug fixes.