Finishing up for first beta