Added equipment management
added equipment
various uncommitted changes; pace/speed calculation fix