last changes on style. work finish on last-ember branch