Fixed minor things