diff --git a/Shadowrun5th/Shadowrun5th.css b/Shadowrun5th/Shadowrun5th.css
index bff9ccb4d9..dc45d689f9 100644
--- a/Shadowrun5th/Shadowrun5th.css
+++ b/Shadowrun5th/Shadowrun5th.css
@@ -164,12 +164,6 @@ input[type=radio].tab8:checked ~ div.content8
     color:inherit;
 }
 
-.tooltip{
-    display:inline-block;
-    font-size:0.65em;
-    line-height:90%;
-    margin-left:-13%;
-}
 
 div .reloadlabel label,
 div .chummerimport label{
@@ -371,7 +365,7 @@ select{
 .magicianinitiation,
 input.technomancycheckbox:checked ~ div.technomancerinitiation,
 input.technomancycheckbox:checked ~ div.labeltechnomancer,
-input.technomancycheckbox:checked ~ label.labeltechnomancer{
+input.technomancycheckbox:checked ~ div label.labeltechnomancer{
     display:block;
 }
 
@@ -506,7 +500,7 @@ input.technomancycheckbox:checked ~ label.labeltechnomancer{
 .edgeticked,
 .edgecheckbox:checked ~ div.edgeunticked,
 .technomancycheckbox,
-.labeltechnomancer,
+div .labeltechnomancer,
 .technomancer,
 .technomancerinitiation,
 .rollbuttonnospec,
@@ -919,7 +913,7 @@ input.technomancycheckbox:checked ~ div.technomancer{
 .charinfo input[type=text],
 .charinfo textarea,
 .chummertextfield textarea{
-    width:100%;
+    width:100% !important;
     vertical-align:top;
     background-color:#444444;
     color:inherit;
@@ -1018,8 +1012,7 @@ input[disabled="true"]{
 .essencelabelwrapper label,
 .mskillmodlabel label{
     text-align:right;  
-    position:relative;
-    bottom:0.25em;  
+    font-size: initial;
 }
 
 
diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html
index 942a654ab7..d56bb7c770 100644
--- a/Shadowrun5th/Shadowrun5th.html
+++ b/Shadowrun5th/Shadowrun5th.html
@@ -8003,7 +8003,6 @@ The inventory name can have additional letters or words
 eg 'APDS-Rounds' when the ammunition is ony called 'APDS'
 Only takes the first match even if multiple identical entries are found.">
                 <div class="reloadlabel"><label>Reload</label></div>
-                <div class="tooltip">Hover for<br>Tooltip</div>
             </div>
             <div class="weaponrow">
                 <div class="weaponmeleewrapper">
@@ -10224,7 +10223,7 @@ on("change:chummercheckbox", function(){
                     if(chummerfile.characters.character.armors!=null){
                         console.log("Importing armors");
                         if(chummerfile.characters.character.armors.armor.length>1){
-                            for(var i=1;i<chummerfile.characters.character.armors.armor.length+1&&i<=6;i++){
+                            for(var i=1;i<chummerfile.characters.character.armors.armor.length+1&&i<=8;i++){
                                 attributes["armorname"+i]=chummerfile.characters.character.armors.armor[i-1].name;
                                 attributes["armorrating"+i]=chummerfile.characters.character.armors.armor[i-1].armor;
                                 attributes["armornotes"+i]="";
@@ -10342,6 +10341,12 @@ on("change:chummercheckbox", function(){
                                     if(text.experimental== "on" && chummerfile.characters.character.weapons.weapon[i-1].clips !== null){
                                         if(chummerfile.characters.character.weapons.weapon[i-1].clips.clip.length>1){
                                             for(var j=0; j<chummerfile.characters.character.weapons.weapon[i-1].clips.clip.length; j++){
+
+                                                if(chummerfile.characters.character.weapons.weapon[i-1].clips.clip[j].location === "loaded") {
+                                                    //skip loaded, they will be found later anyway
+                                                    continue;
+                                                }
+
                                                 var newrowid=generateRowID();
                                                 //find ammo to get stats
                                                 ammo = ammunition.find(clip => clip.guid === chummerfile.characters.character.weapons.weapon[i-1].clips.clip[j].id);
@@ -10349,7 +10354,7 @@ on("change:chummercheckbox", function(){
                                                 if(ammo.weaponbonusdamage_english != null) {
                                                     attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=ammo.weaponbonusdamage_english.substring(0,2);
                                                     attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=ammo.weaponbonusdamage_english.substring(2);
-                                                    if(ammo.name_english = "Ammo: Stick-n-Shock") {
+                                                    if(ammo.name_english === "Ammo: Stick-n-Shock") {
                                                         attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
                                                     }
                                                     else {
@@ -10360,7 +10365,7 @@ on("change:chummercheckbox", function(){
                                                 else {
                                                     attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=0;
                                                     attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=0;
-                                                    if(ammo.name_english = "Ammo: Stick-n-Shock") {
+                                                    if(ammo.name_english === "Ammo: Stick-n-Shock") {
                                                         attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
                                                     }
                                                     else {
@@ -10377,7 +10382,7 @@ on("change:chummercheckbox", function(){
                                             if(ammo.weaponbonusdamage_english != null) {
                                                     attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=ammo.weaponbonusdamage_english.substring(0,2);
                                                     attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=ammo.weaponbonusdamage_english.substring(2);
-                                                    if(ammo.name_english = "Ammo: Stick-n-Shock") {
+                                                    if(ammo.name_english === "Ammo: Stick-n-Shock") {
                                                         attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
                                                     }
                                                     else {
@@ -10388,7 +10393,7 @@ on("change:chummercheckbox", function(){
                                             else {
                                                     attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=0;
                                                     attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=0;
-                                                    if(ammo.name_english = "Ammo: Stick-n-Shock") {
+                                                    if(ammo.name_english === "Ammo: Stick-n-Shock") {
                                                         attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
                                                     }
                                                     else {
@@ -10433,13 +10438,18 @@ on("change:chummercheckbox", function(){
                                 if(text.experimental== "on" && chummerfile.characters.character.weapons.weapon.clips !== null){
                                         if(chummerfile.characters.character.weapons.weapon.clips.clip.length>1){
                                             for(var j=0; j<chummerfile.characters.character.weapons.weapon.clips.clip.length; j++){
+                                                if(chummerfile.characters.character.weapons.weapon[i-1].clips.clip[j].location === "loaded") {
+                                                    //skip loaded, they will be found later anyway
+                                                    continue;
+                                                }
+
                                                 var newrowid=generateRowID();
                                                 //find ammo to get stats
                                                 ammo = ammunition.find(clip => clip.guid === chummerfile.characters.character.weapons.weapon.clips.clip[j].id);
                                                 if(ammo.weaponbonusdamage_english != null) {
                                                     attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=ammo.weaponbonusdamage_english.substring(0,2);
                                                     attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=ammo.weaponbonusdamage_english.substring(2);
-                                                    if(ammo.name_english = "Ammo: Stick-n-Shock") {
+                                                    if(ammo.name_english === "Ammo: Stick-n-Shock") {
                                                         attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap1"]
                                                     }
                                                     else {
@@ -10450,11 +10460,11 @@ on("change:chummercheckbox", function(){
                                                 else {
                                                     attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=0;
                                                     attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=0;
-                                                    if(ammo.name_english = "Ammo: Stick-n-Shock") {
+                                                    if(ammo.name_english === "Ammo: Stick-n-Shock") {
                                                         attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap1"]
                                                     }
                                                     else {
-                                                        attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=ammo.weaponbonusap;
+                                                        attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = ammo.weaponbonusap;
                                                     }
                                                     attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]=0;
                                                 }
@@ -10466,15 +10476,25 @@ on("change:chummercheckbox", function(){
                                             if(ammo.weaponbonusdamage_english != null) {
                                                     attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=ammo.weaponbonusdamage_english.substring(0,2);
                                                     attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=ammo.weaponbonusdamage_english.substring(2);
-                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=ammo.weaponbonusap;
+                                                    if(ammo.name_english === "Ammo: Stick-n-Shock") {
+                                                        attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap1"]
+                                                    }
+                                                    else {
+                                                        attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=ammo.weaponbonusap;
+                                                    }
                                                     attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]=ammo.weaponbonusacc;
-                                            }
-                                            else {
+                                                }
+                                                else {
                                                     attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=0;
                                                     attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=0;
-                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=0;
+                                                    if(ammo.name_english === "Ammo: Stick-n-Shock") {
+                                                        attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap1"]
+                                                    }
+                                                    else {
+                                                        attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = ammo.weaponbonusap;
+                                                    }
                                                     attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]=0;
-                                            }
+                                                }
                                         }
                                     }
                             }