More improvements and updates