curabitr update

still a lot of stuff to do