fix warning and stuff, that was a messed up merge