changed power and signal pins to more convenient locations. clean up some lines