Integration of the new API systems as well as a few bugs squashed.