fixd some small issues