replace deplicated find(:first) with just .first
fixed bug introducted by refactoring
fixed var naming
progress; issues with :broadcast_type factory not beeing registerd