edited CHANGES file
some fixes
more changes
minor README changes
merge one