configured bullet popups in dev mode, fixed one N+1 call
fixed merge conflict