Expanding documentation

Like #217, only squashed