fix modified_time bug and add TODO