fixes
tracker
merged with master