First beta stable : little cleaning + modifications