Some changes that...

Closes #19, closes #18, closes #17, closes #16