API call usage reduction, fixes & tweaks