fix here and there for wrapping up this pr