A couple improvements

I need to probably rewrite some of this. CreepScore's API is way better.