Add "fairyTree." to controllers and factories. + some minor fixes.