Working Waitlist and small fixes