Fixed collision detection, added username