house cleaning.. some renaming and getting rid of compiler warnings.