add more tests on aops
add cjump (yay)
fix up cjump code a bit
fix includes
add runtime calls
change commenting of includes
do i have to add this..
fix merge