Merge pull request #403 from jlipps/master

fix empty selector crash
go easier on these swipes to make them less flakey
fixes #330