Some blank lines moved around
Better Makefile-flag name
Local changes found on the notebook
Merged ollo-dev branches