cleanup and readmen
merge