Mostly fixed
Closes #120