added and fixed something