fixed most of beta test issues