fat commit, refactor fixes #60 and fixes #59