Updated comments and copyright info.