a couupe of bug fixes
a couple of bug fixes - and a test
collapse two identical functions
refactoring
move some stuff around
move some stuff around