fixed all warnings