bug fix (was using old syntax)
Cosmetic fixes