fix some places
some work