Fixed some minor bugs. Found one with .// processing that's not fixed yet.