some cleanup, minor dealing with compiler warnings