finished admin...adjusted some stuff in the other .java files