Updated parser

- Fix Expires processing
- Changed Content-Type processing
- Several clean ups