Bug fixin' an' tweekin'