Enhancements

Not complete.