Prepare for PR, update links for upstream nnnick repository