fixes
more fixes
use map for now
new CPlusPlus