some fixes, still some issues