Feature: calibration pulled from samples, fix: features & more code
fixes