fixing some issues.