fixed trollop formatting issues, still need to change parts of code so it
uses those values