fixing some issues 3