Updates and bug fixes.