fixing variou issues