Clean up main. Add copy constructor. Mark new FIXMEs.