Fix all the bugs - almost out of beta!