fixed some regexp stuff