fixes
more changes