formatting & minor rewrite of concepts and internals