Updating objectives. Other small tweaks