some corrections. better test files.  ready for shapes?