Minor updates to first working version.