Fixed up a few of the functions for version 2.3, but there's still a bit of work to do to get all the functionality back as it was before.