Several changes
Closes #4