API Cleanup, Examples, Bug fixes