update references
cleanup language