Bug fixes and much worse default implementation