* applied callab/callba macros where possible
* corrected some mislabeled jump addresses