Some further work and cleanup on movement code
Thread -> Tread