Added two new elements & bug fixes