a few more changes

added a new option, need to comment my options and work out how to work out these functions