some xml and cross damin changes