added elementalist changes and fixes