fixed some namespacing, working output