IMPORTANT FIX: Now popping context after build run
Fixes & improvements all over the place