Type fixes, removed the LANG attribute