Some improvements (no major changes)