+ Fixed minor bugs