Added link defaults
more sundry changes.