Minor cleanups and more confused/apologetic comments