Polishing up code, collisions, and crap