round of small changes to get the new approach working, calcomp still isnt working...