More commenting and docs