fixed bugs.  Initial feature-set complete