Adding JLS; fix some missing debug statements