Fix overlay issues, closes #44.
Tweaks.