Bug fix
Capital letters to comply with the http standard
Misc fixes