fix some problems
fix smth