Fixed some minor probs.  Still need to re-architect.