Added setters for position and updated collision detection