Fixed some more

Because actually, we should use as little type casting as possible, and
since the screen is pixels (read: ints) i'd rather do comparison for
bounds in ints than in floats (this happened in a lot of places)