Documentation, minor changes in code