Correct bugs and try to copy Marquage