Sm to elk

Few bits (links and alike) here and there (still many to take care of).