Brought up to speed with current main repository. Replaced all old files with newer versions.