guid format update and bug fixes