Bugs fixed, summary functionality implemented