Cleaned up code a little, put a warning on ExpectRegex to do with its unreliability due to the regex been applied to a stream of partial content