added var definitions where missing