Minor improvements & bugfixes
Start the example refactoring