fixed namespaces and added todo's