Fix fancy summary and add some cap stuff