Dev

Lots of improvements, closes #15 among others.