fixed some namespaces and implement a missed ','