Fixed several things

Closes #119
Closes #115
Closes #113
Closes #81