CoM bugfix, wrapper
COM added + recalibrate