Hope I fixed all of the horizontal check bugs
Merge remote-tracking branch 'origin/master'
A few random changes, what will be next?