Some corrections + maintenance mode