minor fixes
pulled latest from repo
fixed file replaced by diff