Exercise mods

@gtback this closes #158, closes #159, and #160