Added content and fixed validation issues