Closed issue #1, edits in SI_controls.c and GC_shot.c/.h