more admin work, fixes