fixed another warning
fixed some minor things