Includes bug fixes and reimplements some features that were removed previously.