Fix some validation issues, add Statuses