commiting some local fixes
merge