Improved reporting
Improved cap, added state dumping