More setup and doc fixes