Updated some stuff
Closes #15