Added features, OS X bug fixes