finished fixing up http