Working invitation list, some fixes