cleaned up usages , fixed namespaces. fixing profile now