Some finalizing tweaks. Removed experimental bits that don't work.