update the builder + fixes on plugin