fixed some namespace bugs