fixes #6 and improves ux with custom content