[D641] updated core content functions, cleanup