more ember stuff and fixing bug