Trying to fill some gaps in documentation