smaller edits. paused to decide how to cover 

the testing stuff.