fixed some issues that was be commented