Examples and small fixes