updates and cleans
merge