Adding my changes from 12/4, includes admin web page changes