bug fixes and full heckle testing coverage