added most stuff to SPaCT (some errors remain)