global fixes and new rush_tup.py