BUGFIX: forgot to set default values for some new variables