Added todos and modified some files