Documenting and cleaning up, adding missing file