Fixed mistakes to josh