removed warnings, etc