some cleanup + adding Garrett's mods to TupleObjects