fix
merge
misc fixes