add TODO, minor changes to silver