Cleaned up header. Fixed symbol names to match new api.