updated bugs for 2.0 beta 2