UPDATED all

fixed somes TODO and we modified some methods