Added updates

Updated more TODOs

Included recent updates

Updated more feature that are implemented