fixing warnings, and stuff