Ironed out a lot of the bugs