More tweaks

More attempts to figure out what's goofing up in the line clearing &
scoring functions.