fixed the mess up from previous commit. last commit fixed some bugs, though. that remains.