fixed some warnings, keep on working to fix all.