VARIOUS FIXES AND ENHANCEMENTS