fixed something issues