Fixing a few more invalid datas, some code cleanup, data population routines