Fixed a little bug i accidently added while testing. Also fixed a bug
that we already fixed awhlie ago...must have been overwritten...