fixed up content errors and changed names to be more standard