OSX embedding now working; Cleanup