xp tracking completely rewrote, generic paint added, few other things
changed