continued refactoring

went back to full mini disclaimer