Some bigger bugs ironed out