misc fixes plus sclar expression