Some improvements and cleanings