minor change and add todos