Update/standardize documentation and add TODO