Fix bug in loquor and add extra types