minor changes in interpreter and visitors