seperated content into data file, other minor mods