minor fixes and review