Finishing beta touches