standard rest names. fix double splice on delete. clean up