fixes in code
resolve
misc