minor improvements and updates