Add tracking, edit small changes