added category lang support & fixed errors