base example fixed & some cosmetic fixes