Fixes, closes #63 and closes #62