+ Fixed few minor bugs