bugfixes and more variable integration

got it running again here.