Fixes#18 . Also, more comments!