Some tweaks and adding an HTTP content negotiation method, not functional yet FYI.