updated bugs for beta 3