shift of inclusions from origin to arbitrary position
proper usage of solver callback and some fixes