updates to address bugs with new api integration