fixed regex some more