fixed all of the bs from the last merge. I hate you firefox. Learn to use SVGS.... then I owuldn't be in this mess.