Fixing and code cleanup

Summaries do now work again