added a few item in TODO