solved some issues