Some few fixes, example updated