adding some attribution, updating TODO