Some improvements and division