Add comments, finalize first iteration