some issues got fixed