diff --git a/js/classes/Achievement.js b/js/classes/Achievement.js
index 62b3df6d..65290acd 100644
--- a/js/classes/Achievement.js
+++ b/js/classes/Achievement.js
@@ -50,13 +50,9 @@ class Achievement {
 
 	get desc() {
 		return (
-			this.title +
-			"\n" +
 			(ACH_DATA.descs[this.name] !== undefined
 				? this.parse(ACH_DATA.descs[this.name])
-				: "Not currently implemented.") +
-			"\n" +
-			(this.reward === "" ? "" : "Reward: " + this.reward)
+				: "Not currently implemented.")
 		);
 	}
 
@@ -67,7 +63,9 @@ class Achievement {
 	grant() {
 		if (!player.achievements.includes(this.name) && getAllAchievements().includes(this.name)) {
 			player.achievements.push(this.name);
-			notifier.success("Achievement gotten: " + ACH_DATA.names[this.name]);
+			const message = "Achievement gotten: " + ACH_DATA.names[this.name];
+			notifier.success(message);
+			document.ariaNotify(message); // specifically do it here or we get "game saved!" every 5s
 		}
 	}
 	
diff --git a/js/functions/achievements.js b/js/functions/achievements.js
index d885b9e8..26fb8e13 100644
--- a/js/functions/achievements.js
+++ b/js/functions/achievements.js
@@ -212,6 +212,28 @@ function checkR19Ach() {
 function updateAchievements() {
 	tmp.nopathogenupgs = getTotalPathogenUpgrades().eq(0)
 	for (let r=1;r<=ACH_DATA.rows;r++) if (!Achievement.hasRow(r)) window["checkR"+r+"Ach"]();
+	if (isTabShown("achievements")) {
+		for (let r = 1; r <= ACH_DATA.rows; r++) {
+			for (let c = 1; c <= ACH_DATA.cols; c++) {
+				let id = r * 10 + c;
+				let ach = tmp.ach[id];
+				if (ach) {
+					let el = new Element("ach" + id);
+					let name = ach.title;
+					let req = (ACH_DATA.descs[id] !== undefined ? ach.parse(ACH_DATA.descs[id]) : "Not currently implemented.");
+					let reward = ach.reward;
+					let txt = name + "<br>" + req;
+					if (ach.has) txt += " (completed)";
+					if (reward !== "") txt += "<br>Reward: " + reward;
+					el.setHTML(txt);
+					el.setClasses({
+						achCont: true,
+						[ach.has ? "completed" : "locked"]: true
+					});
+				}
+			}
+		}
+	}
 }
 
 function rowComplete(r) {
diff --git a/js/main/elementary/skyrmion.js b/js/main/elementary/skyrmion.js
index 1b7165c9..081714ef 100644
--- a/js/main/elementary/skyrmion.js
+++ b/js/main/elementary/skyrmion.js
@@ -197,7 +197,7 @@ function setupSkyField(type) {
 		html += "<table><tr>"
 		for (let j=0;j<data.placements[i].length;j++) {
 			let id = data.placements[i][j]
-			html += "<td class='hexContainer'><button id='"+type+"Upg"+id+"' class='hexBtn' onmouseover='"+type+"Sel = "+id+";' onclick='buySkyUpg(&quot;"+type+"&quot;, "+id+")'>&"+GREEK_LETTERS[id]+";</button></td>"
+			html += "<td class='hexContainer'><button id='"+type+"Upg"+id+"' class='hexBtn' onclick='buySkyUpg(&quot;"+type+"&quot;, "+id+")'>&"+GREEK_LETTERS[id]+";</button></td>"
 		}
 		html += "</tr></table>"
 	}
@@ -271,8 +271,8 @@ function maxField(type, lims={}, ignoreUpgReq=false) {
 
 function maxBothFields() {
 	if (!tmp.ach[178].has) return;
-	maxField("pions", {}, true)
-	maxField("spinors", {}, true)
+	maxField("pions")
+	maxField("spinors")
 }
 
 function exportField(type) {
diff --git a/js/main/elements.js b/js/main/elements.js
index 105f3505..eeb73f70 100644
--- a/js/main/elements.js
+++ b/js/main/elements.js
@@ -297,9 +297,9 @@ function updateTimeReversalHTML(){
 			if (!tr2Pow().eq(1) && i == 2) desc += "<span class='grossminitxt'>(^" + showNum(tr2Pow()) + ")</span>";
 			if (!tr11Pow().eq(1) && i == 11)
 				desc += "<span class='grossminitxt'>(^" + showNum(tr11Pow()) + ")</span>";
-			tmp.el["tr" + i].setHTML(desc + "<br>Cost: " + showNum(upg.cost()) + " Time Cubes.");
-			if (upg.current !== undefined && (i > 15 ? modeActive("extreme") : true))
-				tmp.el["tr" + i].setTooltip("Currently: " + upg.disp(upg.current()));
+			const effect = upg.current !== undefined && (i > 15 ? modeActive("extreme") : true) ? "Currently: " + upg.disp(upg.current()) + "<br>" : "";
+			const cost = !player.tr.upgrades.includes(i) ? "Cost: " + showNum(upg.cost()) + " Time Cubes." : "";
+			tmp.el["tr" + i].setHTML(desc + "<br>" + effect + cost);
 			tmp.el["tr" + i].setClasses({
 				btn: true,
 				locked: !player.tr.upgrades.includes(i) && player.tr.cubes.lt(upg.cost()),
@@ -340,8 +340,9 @@ function updateCollpaseHTML(){
 		);
 		for (let i = 1; i <= EM_AMT; i++) {
 			let ms = ESSENCE_MILESTONES[i];
-			tmp.el["lem" + i].setHTML(ms.desc + "<br>Req: " + showNum(ms.req) + " Life Essence.");
-			if (ms.disp !== undefined) tmp.el["lem" + i].setTooltip("Currently: " + ms.disp());
+			const active = hasCollapseMilestone(i) ? "<br>Active" : "";
+			const reward = ms.disp !== undefined ? "Currently: " + ms.disp() +"<br>" : "";
+			tmp.el["lem" + i].setHTML(ms.desc + active + "<br>" + reward + "Req: " + showNum(ms.req) + " Life Essence.");
 			tmp.el["lem" + i].setClasses({ msCont: true, r: !hasCollapseMilestone(i) });
 		}
 	}
@@ -467,6 +468,14 @@ function updateDarkCircleHTML(){
 	}
 }
 
+
+function srInfUpgBuy(event, id) {
+//	if(event.shiftKey) {
+//		document.ariaNotify(tmp.inf.upgs.desc(id));
+//	} else {
+		tmp.inf.upgs.buy(id);
+//	}
+}
 function updateInfinityEndorsementStuffHTML(){
 	tmp.el.endorsementManual.setDisplay(
 		player.inf.endorsements.gte(10) && ((tmp.inf.can && !player.automators["endorsements"]) || tmp.inf.stadium.canComplete)
@@ -495,16 +504,27 @@ function updateInfinitySubtabHTML(){
 		tmp.el.nextEndorsement.setTxt(formatDistance(tmp.inf.req));
 		tmp.el.knowledge.setTxt(showNum(player.inf.knowledge));
 		tmp.el.knowledgeGain.setTxt(formatGain(player.inf.knowledge, tmp.inf.knowledgeGain, "knowledge"));
+	let infTable = new Element("infUpgs");
 		for (let r = 1; r <= INF_UPGS.rows; r++) {
 			for (let c = 1; c <= INF_UPGS.cols; c++) {
+				const id = `${r};${c}`;
 				let state = "";
-				if (tmp.inf.upgs.repealed(r+";"+c) && !modeActive("easy")) state = "repealed";
-				else if (!tmp.inf.upgs.canBuy(r+";"+c)) state = "locked";
-				else if (player.inf.upgrades.includes(r+";"+c)) state = "bought";
-				else if (player.inf.knowledge.gte(ExpantaNum.mul(INF_UPGS.costs[r+";"+c], tmp.inf.upgCostMult(r+";"+c)))) state = "unbought";
+				if (tmp.inf.upgs.repealed(id) && !modeActive("easy")) state = "repealed";
+				else if (!tmp.inf.upgs.canBuy(id)) state = "locked";
+				else if (player.inf.upgrades.includes(id)) state = "bought";
+				else if (player.inf.knowledge.gte(ExpantaNum.mul(INF_UPGS.costs[id], tmp.inf.upgCostMult(id)))) state = "unbought";
 				else state = "locked";
-				tmp.el["inf" + (r+";"+c)].setDisplay(tmp.inf.upgs.shown(r+";"+c));
-				tmp.el["inf" + (r+";"+c)].setClasses({
+				let cell = tmp.el[`inf-cell-${id}`];
+				let elem = tmp.el[`inf-${id}`];
+//				let effectElem = tmp.el["inf-effect-" + id];
+
+				cell.setDisplay(tmp.inf.upgs.shown(id));
+				elem.setHTML(tmp.inf.upgs.desc(id));
+//				if(tmp.inf.upgs.effects[id]) {
+					//effectElem.setTxt(INF_UPGS.effects[id]());
+//				}
+				//elem.setAttr("aria-pressed", state == "pressed");
+				elem.setClasses({
 					btn: true,
 					inf: state == "unbought",
 					locked: state == "locked",
@@ -562,7 +582,7 @@ function updateAscensionHTML(){
 function updateNormalStadiumHTML(){
 	for (let i = 0; i < Object.keys(STADIUM_DESCS).length; i++) {
 		let name = Object.keys(STADIUM_DESCS)[i];
-		tmp.el[name + "Div"].setTooltip(tmp.inf.stadium.tooltip(name));
+		tmp.el[name + "Div-effect"].setTxt(tmp.inf.stadium.tooltip(name));
 		tmp.el[name + "Div"].setClasses({
 			stadiumChall: true,
 			comp: player.inf.stadium.completions.includes(name)
@@ -957,7 +977,7 @@ function updateQuarksHTML(){
 		showNum(player.elementary.fermions.quarks.amount) + " " + tmp.elm.ferm.quarkName() + " Quarks"
 	);
 	tmp.el.quarkGain.setTxt(showNum(adjustGen(tmp.elm.ferm.quarkGain, "quarks")));
-	tmp.el.quarkRewards.setTooltip(
+	tmp.el.quarkRewards.setTxt(
 		tmp.elm.ferm.quarkName(true) +
 			" Quarks: " +
 			tmp.elm.ferm.quarkDesc(QUARK_NAMES[player.elementary.fermions.quarks.type - 1])
@@ -969,7 +989,7 @@ function updateLeptonsHTML(){
 		showNum(player.elementary.fermions.leptons.amount) + " " + tmp.elm.ferm.leptonName() + " Leptons"
 	);
 	tmp.el.leptonGain.setTxt(showNum(adjustGen(tmp.elm.ferm.leptonGain, "leptons")));
-	tmp.el.leptonRewards.setTooltip(
+	tmp.el.leptonRewards.setTxt(
 		tmp.elm.ferm.leptonName(true) +
 			" Leptons: " +
 			tmp.elm.ferm.leptonDesc(LEPTON_NAMES[player.elementary.fermions.leptons.type - 1])
@@ -1085,16 +1105,36 @@ function updateScalarBosonsHTML(){
 				let ac = extra.active()
 				if (ac) text = extra.desc[ac]
 			}
-			tmp.el["higgs"+name].setHTML(text+"<br>Cost: "+showNum(data.cost)+" Higgs Bosons.")
+			let effect = null;
+			switch(name) {
+				case "1;1;0":
+				effect = "Currently: "+showNum(tmp.elm.bos["higgs_1;1;0"](true))+"x"
+			break;
+				case "0;1;1":
+				effect = "Currently: "+showNum(tmp.elm.bos["higgs_0;1;1"](true))+"x"
+			break;
+				case "3;0;0":
+				effect = "Currently: "+showNum(tmp.elm.bos["higgs_3;0;0"](true))+"x"
+			break;
+				case "0;2;1":
+				effect = "Currently: +"+showNum(tmp.elm.bos["higgs_0;2;1"](true))+"%"
+			break;
+				case "0;0;4":
+			effect = "Currently: "+showNum(tmp.elm.bos["higgs_0;0;4"](true))+"x"
+			break;
+				case "1;3;0":
+				effect = "Currently: "+showNum(tmp.elm.bos["higgs_1;3;0"](true))+"x"
+			break;
+				case "0;3;1":
+				effect = "Currently: "+showNum(tmp.elm.bos["higgs_0;3;1"](true))+"x"
+			break;
+				case "0;0;5":
+				effect = "Currently: "+showNum(tmp.elm.bos["higgs_0;0;5"](true))+" later"
+			break;
+			}
+			const cost = !player.elementary.bosons.scalar.higgs.upgrades.includes(name) ? `Cost: ${showNum(data.cost)} Higgs Bosons.` : ""
+			tmp.el["higgs"+name].setHTML(`${text}${effect ? "<br>" + effect : ""}${cost}`)
 		}
-		tmp.el["higgs1;1;0"].setTooltip("Currently: "+showNum(tmp.elm.bos["higgs_1;1;0"](true))+"x")
-		tmp.el["higgs0;1;1"].setTooltip("Currently: "+showNum(tmp.elm.bos["higgs_0;1;1"](true))+"x")
-		tmp.el["higgs3;0;0"].setTooltip("Currently: "+showNum(tmp.elm.bos["higgs_3;0;0"](true))+"x")
-		tmp.el["higgs0;2;1"].setTooltip("Currently: +"+showNum(tmp.elm.bos["higgs_0;2;1"](true))+"%")
-		tmp.el["higgs0;0;4"].setTooltip("Currently: "+showNum(tmp.elm.bos["higgs_0;0;4"](true))+"x")
-		tmp.el["higgs1;3;0"].setTooltip("Currently: "+showNum(tmp.elm.bos["higgs_1;3;0"](true))+"x")
-		tmp.el["higgs0;3;1"].setTooltip("Currently: "+showNum(tmp.elm.bos["higgs_0;3;1"](true))+"x")
-		tmp.el["higgs0;0;5"].setTooltip("Currently: "+showNum(tmp.elm.bos["higgs_0;0;5"](true))+" later")
 	}
 }
 
@@ -1135,7 +1175,7 @@ function updateTheoryTreeHTML(){
 			let pref = player.options.tht?"gTree":"tree"
 			tmp.el[pref+i].changeStyle("visibility", (TREE_UPGS[i].unl?TREE_UPGS[i].unl():true)?"visible":"hidden")
 			let cap = getTreeUpgCap(i)
-			tmp.el[pref+i].setTxt(showNum(bought)+"/"+showNum(cap))
+//			tmp.el[pref+i].setTxt(showNum(bought)+"/"+showNum(cap))
 			tmp.el[pref+i].setClasses({tree: true, capped: bought.gte(cap), unl: (!(bought.gte(cap))&&player.elementary.theory.points.gte(TREE_UPGS[i].cost(bought.div(tmp.elm.theory.tree.costScaling)).div(tmp.elm.theory.tree.costReduc).round())), locked: (!(bought.gte(cap))&&!player.elementary.theory.points.gte(TREE_UPGS[i].cost(bought.div(tmp.elm.theory.tree.costScaling)).div(tmp.elm.theory.tree.costReduc).round()))})
 		}
 		if (player.options.tht) {
@@ -1155,7 +1195,7 @@ function updateTheoryTreeHTMLPerSec() {
 			let bought = tmp.elm.theory.tree.bought(i)
 			let cap = getTreeUpgCap(i)
 			let pref = player.options.tht?"gTree":"tree"
-			tmp.el[pref+i].setTooltip(((TREE_UPGS[i].altDesc&&player.options.tht)?TREE_UPGS[i].altDesc:TREE_UPGS[i].desc)+"\n"+(bought.gte(cap)?"":("Cost: "+showNum(TREE_UPGS[i].cost(bought.div(tmp.elm.theory.tree.costScaling)).div(tmp.elm.theory.tree.costReduc).round())+" Theory Points"))+"\nCurrently: "+TREE_UPGS[i].effD(TREE_UPGS[i].effect(ExpantaNum.add(bought, i==7?TREE_UPGS[11].effect(player.elementary.theory.tree.upgrades[11]||0):0))))
+			tmp.el[pref+i].setHTML(showNum(bought)+"/"+showNum(cap)+"<br>"+((TREE_UPGS[i].altDesc&&player.options.tht)?TREE_UPGS[i].altDesc:TREE_UPGS[i].desc)+"\n"+(bought.gte(cap)?"":("Cost: "+showNum(TREE_UPGS[i].cost(bought.div(tmp.elm.theory.tree.costScaling)).div(tmp.elm.theory.tree.costReduc).round())+" Theory Points"))+"\nCurrently: "+TREE_UPGS[i].effD(TREE_UPGS[i].effect(ExpantaNum.add(bought, i==7?TREE_UPGS[11].effect(player.elementary.theory.tree.upgrades[11]||0):0))))
 		}
 	}
 }
@@ -1532,8 +1572,8 @@ function updateSkyHTML() {
 					locked: player.elementary.sky.pions.amount.lt(getFieldUpgCost("pions", id)),
 				})
 				tmp.el["pionUpg"+id].changeStyle("visibility", player.elementary.sky.amount.gte(SKY_FIELDS[id].req)?"visible":"hidden")
+				tmp.el["pionUpg"+id].setHTML(("&"+GREEK_LETTERS[id]+"; ("+showNum(player.elementary.sky.pions.field[id]||0)+")<br>"+SKY_FIELDS[id].pionDesc+"<br>Currently: "+SKY_FIELDS[id].desc(tmp.elm.sky.pionEff[id])+"<br>Cost: "+showNum(getFieldUpgCost("pions", id))+" Pions"))
 			}
-			tmp.el.pionData.setHTML(pionSel==0?"":("Pion Upgrade &"+GREEK_LETTERS[pionSel]+"; ("+showNum(player.elementary.sky.pions.field[pionSel]||0)+")<br>"+SKY_FIELDS[pionSel].pionDesc+"<br>Currently: "+SKY_FIELDS[pionSel].desc(tmp.elm.sky.pionEff[pionSel])+"<br>Cost: "+showNum(getFieldUpgCost("pions", pionSel))+" Pions"))
 			tmp.el.maxPion.setDisplay(player.elementary.entropy.upgrades.includes(20))
 		} else if (skyTab == "spinors") {
 			tmp.el.nextSpinorUpgs.setTxt(player.elementary.sky.amount.gte(SKY_FIELD_UPGS_REQS[SKY_FIELD_UPGS_REQS.length-1])?"":("More upgrades at "+showNum(nextFieldReq)+" Skyrmions"))
@@ -1545,8 +1585,8 @@ function updateSkyHTML() {
 					locked: player.elementary.sky.spinors.amount.lt(getFieldUpgCost("spinors", id)),
 				})
 				tmp.el["spinorUpg"+id].changeStyle("visibility", player.elementary.sky.amount.gte(SKY_FIELDS[id].req)?"visible":"hidden")
+				tmp.el["spinorUpg"+id].setHTML(("&"+GREEK_LETTERS[id]+"; ("+showNum(player.elementary.sky.spinors.field[id]||0)+")<br>"+SKY_FIELDS[id].spinorDesc+"<br>Currently: "+SKY_FIELDS[id].desc(tmp.elm.sky.spinorEff[id])+"<br>Cost: "+showNum(getFieldUpgCost("spinors", id))+" Spinors"))
 			}
-			tmp.el.spinorData.setHTML(spinorSel==0?"":("Spinor Upgrade &"+GREEK_LETTERS[spinorSel]+"; ("+showNum(player.elementary.sky.spinors.field[spinorSel]||0)+")<br>"+SKY_FIELDS[spinorSel].spinorDesc+"<br>Currently: "+SKY_FIELDS[spinorSel].desc(tmp.elm.sky.spinorEff[spinorSel])+"<br>Cost: "+showNum(getFieldUpgCost("spinors", spinorSel))+" Spinors"))
 			tmp.el.maxSpinor.setDisplay(player.elementary.entropy.upgrades.includes(20))
 		}
 	}
@@ -1635,7 +1675,11 @@ function updateHTML() {
 	updateMiscHTML()
 	
 	// Features
-	tmp.el.nextFeature.setTxt(tmp.nf === "none" ? "All Features Unlocked!" : tmp.features[tmp.nf].desc);	
+	let bar = tmp.el.nextFeature;
+	bar.setAttr("aria-label", tmp.nf === "none" ? "All Features Unlocked!" : tmp.features[tmp.nf].desc);	
+	let oldProgress = bar.el.value;
+	let newProgress = tmp.nf == "none" ? 100 : (tmp.features[tmp.nf].progress() * 100).toFixed();
+	if(newProgress !== oldProgress) bar.el.value = newProgress;
 }
 
 function updateHTMLPerSec() {
diff --git a/js/main/inf.js b/js/main/inf.js
index 80812f26..8666a7e6 100644
--- a/js/main/inf.js
+++ b/js/main/inf.js
@@ -123,30 +123,23 @@ function updateTempInfUpgs() {
 	};
 	if (!tmp.inf.upgs.desc) tmp.inf.upgs.desc = function (sel) {
 		if (sel === undefined) return "";
-		return (
-			((sel=="10;1"&&hasMltMilestone(16))?"Superscaled Pathogen Upgrade scaling is weaker based on your Ascension Power, and Distance produces your last Derivative at a reduced rate (unaffected by Time Speed)":INF_UPGS.descs[sel]) +
-			"<br>" +
-			(!tmp.inf.upgs.has(sel)
-				? "Cost: " +
-				  showNum(ExpantaNum.mul(INF_UPGS.costs[sel], tmp.inf.upgCostMult(sel))) +
-				  " knowledge<br>" +
-				  (INF_UPGS.reqs[sel]
-						? "Req: inf" +
-						  INF_UPGS.reqs[sel].reduce(
-								(x, y, i) => x + (i == INF_UPGS.reqs[sel].length ? "" : ", ") + "inf" + y
-						  ) +
-						  "<br>"
-						: "") +
-				  (INF_UPGS.repeals[sel]
-						? "Repeals: inf" +
-						  INF_UPGS.repeals[sel].reduce(
-								(x, y, i) => x + (i == INF_UPGS.repeals[sel].length ? "" : ", ") + "inf" + y
-						  ) +
-						  "<br>"
-						: "")
-				: "") +
-			(INF_UPGS.effects[sel] ? "Currently: " + tmp.inf.upgs.current(sel) : "")
-		);
+		const description = sel=="10;1"&&hasMltMilestone(16)?"Superscaled Pathogen Upgrade scaling is weaker based on your Ascension Power, and Distance produces your last Derivative at a reduced rate (unaffected by Time Speed)":INF_UPGS.descs[sel];
+		const isRepealed = tmp.inf.upgs.repealed(sel) ? "(repealed)" : "";
+		const cost = !tmp.inf.upgs.has(sel) ? `Cost: ${showNum(ExpantaNum.mul(INF_UPGS.costs[sel], tmp.inf.upgCostMult(sel)))} knowledge ${isRepealed}<br>` : "";
+
+		const reqsArray = INF_UPGS.reqs[sel];
+		const repealsArray = INF_UPGS.repeals[sel];
+
+		const reqs = reqsArray ? `Reqs: inf ${reqsArray.reduce((x, y, i) => x + (i == reqsArray.length ? "" : ", ") + "inf" + y)}<br>` : "";
+		const repeals = repealsArray ? `Repeals: inf ${repealsArray.reduce((x, y, i) => x + (i == repealsArray.length ? "" : ", ") + "inf" + y)}<br>` : "";
+		const effect = INF_UPGS.effects[sel] ? `Currently: ${tmp.inf.upgs.current(sel)}` : "";
+
+		return `${description}<br>
+			${cost}
+			${reqs}
+			${repeals}
+			${effect}
+		`;
 	};
 	if (!tmp.inf.upgs.buy) tmp.inf.upgs.buy = function (id) {
 		if (!tmp.inf.upgs.canBuy(id)) return;
diff --git a/js/update.js b/js/update.js
index 0a45872d..70362875 100644
--- a/js/update.js
+++ b/js/update.js
@@ -122,26 +122,27 @@ function setupHTML() {
 
 	// Infinity Upgrade Table
 	let infTable = new Element("infUpgs");
-	table = "";
 	for (let r = 1; r <= INF_UPGS.rows; r++) {
-		table += "<tr>";
+		let row = document.createElement("tr");
+		infTable.el.append(row);
 		for (let c = 1; c <= INF_UPGS.cols; c++) {
 			let id = r + ";" + c;
-			table +=
-				"<td><button id='inf" +
-				id +
-				"' class='btn locked' onmouseover='tmp.inf.upgs.hover(&quot;" +
-				id +
-				"&quot;)' onclick='tmp.inf.upgs.buy(&quot;" +
-				id +
-				"&quot;)'>inf" +
-				id +
-				"</button></td>";
+			let cell = document.createElement("td");
+			row.append(cell);
+			let elem = document.createElement("button");
+			cell.append(elem);
+			elem.id = `inf-${id}`;
+			cell.id = `inf-cell-${id}`;
+			elem.class='btn locked'
+			// elem.onmouseover = () => tmp.inf.upgs.hover(id);
+			elem.onclick = (event) => srInfUpgBuy(event, id);
+/*
+			elem.innerHTML = `${INF_UPGS.descs[id]}
+			Currently: <span id="inf-effect-${id}"></span>
+			Costs: ${INF_UPGS.costs[id]} knowledge`;
+*/
 		}
-		table += "</tr>";
 	}
-	infTable.setHTML(table);
-
 	// Automators
 	let au = new Element("automator");
 	autos = "<br>";
diff --git a/main.html b/main.html
index 28803c2e..efd02fc5 100644
--- a/main.html
+++ b/main.html
@@ -88,7 +88,7 @@
 	<div id="mainContainer" style="display: none">
 		<div class="band lb" style="min-height: 100px;">
 			<button id="mltReset" class="btn locked" onclick="mltReset()"></button>
-			<p class="halfline">&nbsp;</p><span id="linkToGame"></span><span id="nextFeature"></span><p class="halfline">&nbsp;</p>
+			<p class="halfline">&nbsp;</p><span id="linkToGame"></span><progress min="0" max="100" id="nextFeature"></progress><p class="halfline">&nbsp;</p>
 			<div id="newsticker"><div id="news"></div></div><br>
 			<div style="overflow-x: auto;">
 				<table>
@@ -1034,7 +1034,7 @@
 				<button class="btn inf" onclick="tmp.inf.upgs.reset()">Reset Infinity Upgrades</button><br /><br />
 				<div id="infUpgData" class="bandBig or"></div>
 				<br /><br />
-				<div style="overflow-x: auto;"><table id="infUpgs"></table><br><br></div>
+				<div style="overflow-x: auto;"><table id="infUpgs" role="table"></table><br><br></div>
 				<br /><br />
 			</div>
 			<div id="ascension" class="inftab">
@@ -1140,8 +1140,8 @@
 				<span id="stadiumProg"></span><br><br>
 				<table>
 					<tr>
-						<td id="spaceonDiv" class="stadiumChall" tooltip="Spaceon Challenge Description">
-							<div class="spaceon">Spaceon</div><br /><button
+						<td id="spaceonDiv" class="stadiumChall">
+							<div class="spaceon">Spaceon</div><div id="spaceonDiv-effect"></div><br /><button
 								id="spaceonChall"
 								class="btn locked"
 								onclick="tmp.inf.stadium.start('spaceon')"
@@ -1149,8 +1149,8 @@
 								Start</button
 							><br /><br /><span id="spaceonBtm" class="stadiumDesc"></span>
 						</td>
-						<td id="solarisDiv" class="stadiumChall" tooltip="Solaris Challenge Description">
-							<div class="solaris">Solaris</div><br /><button
+						<td id="solarisDiv" class="stadiumChall">
+							<div class="solaris">Solaris</div><div id="solarisDiv-effect"></div><br /><button
 								id="solarisChall"
 								class="btn locked"
 								onclick="tmp.inf.stadium.start('solaris')"
@@ -1158,8 +1158,8 @@
 								Start</button
 							><br /><br /><span id="solarisBtm" class="stadiumDesc"></span>
 						</td>
-						<td id="infinityDiv" class="stadiumChall" tooltip="Infinity Challenge Description">
-							<div class="infinity">Infinity</div><br /><button
+						<td id="infinityDiv" class="stadiumChall">
+							<div class="infinity">Infinity</div><div id="infinityDiv-effect"></div><br /><button
 								id="infinityChall"
 								class="btn locked"
 								onclick="tmp.inf.stadium.start('infinity')"
@@ -1167,8 +1167,8 @@
 								Start</button
 							><br /><br /><span id="infinityBtm" class="stadiumDesc"></span>
 						</td>
-						<td id="eternityDiv" class="stadiumChall" tooltip="Eternity Challenge Description">
-							<div class="eternity">Eternity</div><br /><button
+						<td id="eternityDiv" class="stadiumChall">
+							<div class="eternity">Eternity</div><div id="eternityDiv-effect"></div><br /><button
 								id="eternityChall"
 								class="btn locked"
 								onclick="tmp.inf.stadium.start('eternity')"
@@ -1176,8 +1176,8 @@
 								Start</button
 							><br /><br /><span id="eternityBtm" class="stadiumDesc"></span>
 						</td>
-						<td id="realityDiv" class="stadiumChall" tooltip="Reality Challenge Description">
-							<div class="reality">Reality</div><br /><button
+						<td id="realityDiv" class="stadiumChall">
+							<div class="reality">Reality</div><div id="realityDiv-effect"></div><br /><button
 								id="realityChall"
 								class="btn locked"
 								onclick="tmp.inf.stadium.start('reality')"
@@ -1185,8 +1185,8 @@
 								Start</button
 							><br /><br /><span id="realityBtm" class="stadiumDesc"></span>
 						</td>
-						<td id="drigganizDiv" class="stadiumChall" tooltip="Drigganiz Challenge Description">
-							<div class="drigganiz">Drigganiz</div><br /><button
+						<td id="drigganizDiv" class="stadiumChall">
+							<div class="drigganiz">Drigganiz</div><div id="drigganizDiv-effect"></div><br /><button
 								id="drigganizChall"
 								class="btn locked"
 								onclick="tmp.inf.stadium.start('drigganiz')"
@@ -1370,7 +1370,7 @@
 					<span id="quarkGain" class="quark"></span> Quarks/sec.<br />
 					You have <span id="quarks" class="quark"></span>.<br /><br />
 					<button id="quarkRewards" class="btn elm" onclick="tmp.elm.ferm.changeQuark()">
-						Hover to see current Quark effect<br />Click to change Quark Type
+Hover to see current Quark effect<br />Click to change Quark Type
 					</button>
 				</div>
 				<div style="width: 50%; min-height: 300px; background-color: #e34430; float: right; color: black;">