fix infinite loop when expanding source properties & last (?) bugs