fix some things in works
merge