added and changed a few things