Continuing to sort out bugs