Classic Enhancements

Some little Vanilla Improvements