Small changes to misc, working on standardizing tracking
resolved conflict
resolved conflicts