commenting and small fixes