changed and added a few things