bug fix and elmination of inappropriate warning
Merge branch '12-misc-cleanup' into 13
mods entry
Merge branch '12-subassign' into 13