Contact links and implementation + minor improvements