Merge pull request #19 from seavor/jay

modal fixes, etc