cleaned up and changed minor things