Fixes made to SC_Analysis

track_rectangle needs to be tested!