Fixed edit bugs
FIxed TODO
Still Working on types