editing a few things