Updating: fixing up some minor issues.