cleaning compiler warnings and whatnot :)