Updates

Closes #13 
Closes #16