fix rake, and namespacing issues