better regex which now supports commented out expressions, test added too