added opis and nhwrench back
updated all calclavia