fixed all warnings..