Added Swagger with Some Bugs