upgrade ember version, plus some adjustments