Nice various changes!