Some improvements and updates