fixing intenting issues and other minor things