moved things around. no path problems now, hopefully