Added short titles; some other fixes