bugfixes and added VariableDecorator