convert more to stl classes, sliding closer to 64-bit compatible