fixed some regex problems
add tests