Small Improvements

Any idea why the diff of HandlerCollection.cs looks so messy? The file endings were all CRLF...