Many updates. Closes #16.