Doc update - implemented some stuff on TODO