more docs and cleanup concepts