removed warnings and many notes