Cleanup + collision: right, left, down added