edited a few things