slight api changes, fixed partial serving