Fix surface issues! Cleanup, API, fixes, etc.