Some commenting and small changes