Merge and squash. Closes #77
Tweak documentation & functionality of new expes