fixing some issues 2