Fixed the api... mostly.