Comments and small fixes