Administrator update

+minor fixes