gave the entire wrapper/api a huge facelift