fixd some issues