Fixed few small things