Final touches. closes #9