cleanup, improve track, respect rate in offset calculation
missing file
cleanup
cleanup