Continued testing and recalibration

Changed some pin numbers, but all pins need be checked since hardware changes just now