delete old stuff
change some to uint32_t