Track instances

Close #140 
Missing several new argument descriptions