* fixed some reported issues.