Minor continued modifications to autodeclension system....
Merge origin/master