Fixing all the bugs and getting ready for beta launch