more fixes were done