move 520 to its own function, reverse some title fixes for now