added Eclipse null annotations, imported Ashley