fixes before publish
other fixes