Many small fixes before giving to David