updates defaults

removes unnecessary defaults and updates a few others.