Added autosign & minor mods