More comments and made small adjustments