Forgot to commit a bunch of rather important fixes, best do that huh?
This code is clearer