mycontent; maps; fixes;

Closes Issue #39 and #91 and includes some small fixes and tweaks.