Minor style tweaks. Updated docs. Restored a few disabled features.