integrate machine into build ; fix null-return in stack