renamed some vars/funcs; slight change to how we handle syl-cons;