Isolate admin + minor tweaks + added answers