bug fixes and p1.0_beta