Basic code style, include path update, doc fixes