added things I was supposed to put in :)