fixed several points