Misc changes and fixes before IEK Ag. Dimitriou presentation.