Comments several places. Fix Load constructor: a TODO item was actually done, allowing further code simplification.