better track support, closes #10