change url to reflect api changes
update spec to reflect new api
update spacing
update comments and constant
removed comments
fixed merge conflicts