updated significantly.  Still no CSS, but everything else is good.