Worked around a ridiculous build error
Some style fixes and toString() additions