Small revisions, moving to working version.