various changes to get semantic parser working..