fixed some warnings; misc changes