style fixes + two potential errors actually.