more modules and regex hacks