fixed dependencies, more accurate keywords