Ironed out last of the bugs