some issues were fixed