add size_t and such