finishing up with non-admin features