Updating: adding some minor fixes.