fixing titles
TODO cleanup