fixed up include paths and such