Waitlist improvements ftw