fix titles
fix some more issues