wrapping up text fallback regex stuff, more tests