fix various things
merge