fixing id things
merge