More improvements.

Going to go ahead and say closes #17.