Merged in e() and admin changes