Should now have fixed issue #2. Fixed regex substitutuion of underlined bits.