add several more setup instructions
several more cleanups
several more cleanups