Fixed tiny bugs and added small features "À l'arrache"