More/better commenting everywhere.