More bug fixes, a number of which came from the restructuring.
More bug fixes, a number of which came from the restructuring.