Jordan - bug fix and other minor changes