Fixing other small problems and improving visual enhancements