Implemented Jonathan's fixes for insert area and var tracker