minor fixes and linking