minor styling
fixed merge conflict
added tracking stuff