martymulligan add tests, update readme, fix some small bugs