Minor new additions (Vuvuzelas and hearts) and fixes