closes #68 and some other stuff