fixed a few more minor things, propperly pulls from config