edited a few more things