fixing a few bugs.  Still need to look 2 shrt note