Closes #86, Closes #87: Added missing types and updated documentation.