removed warnings and todos