another big refactor
change summaries name to be less redundant
another minor refactor