Another small update and bug fixes.