Doc improvements

These changes hopefully clarify the problems mentioned in #51 and #52.