ID and misc fixes
fixes
fixes