Switched API's

Other API was dead, so moved to another. Small fixes.