some issues fixed and updates.