updated copyright #96
general style fixes