Aldo

I fixed all of the bugs, and the fixes are better than Brad's