Fixed up Ed Markey
Fixed checkbox and other things
Merge pull request #1059 from nousdefions/master

Fixed up Ed Markey