sync'd to ASDS

newer versions of many files