Fixes some minor and a major error

As it says, I noticed some really weird (and sorry if you wrote this) and noticed the whole span span span span madness because my buttons weren't working properly. Anyway these should let some more rules pass ;)