Corrected update bugs and made some fixes (Alpha -> Beta)