Added pin labels and rerouted to work around these a bit more cleanly. Also included note about switch todo.