Feature/manual patch

Fixes outstanding issues with manual.

Should close issue #87.