fixing warnings and stuff