more fixes that I found plus unimportant important tags