Fixed a portion of GFX.  Need to fix L104 and L106 (abort method)