Added filter for IP & e-mail. Changed timeout. Generally tidied up