more fixes were made