lots more updates, trying to get things cleaned up for first distribution!!!