Post compo updates. Refactoring + bug fixes + new features