minor bug swatting and proding with tests