Even more fixes (plus some better feedback)