Add comments and fix copy/paste