bug fixes
more fixes
finalized ppl picker