changed some names and maybe fixed neuron behavior