Ummm.... lots of API call stuff and fixes.