Fixed broken function and added a few for tab of doom