More additions, some re-ordering.
Admin file changes for 0.006.