Cleaned up speed selection, added some speeds.