fixed some namespacing issues