edited a few things and made some changes