verious fixes and updates.