finally fixed all horizontal collision bugs