fixed beta 1 bugs, 31062, 31063, 31101, 31067, 31065