Add a correct responst for unsupported HTTP methods and other minor things
Set correct mode on samples