Fixed namespace
Fixed bugs